From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 May 2011 18:24:32 +0000 (-0700)
Subject: Merge branch 'fbmem'
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~14158
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=afa49791caae70cc3fd665a182eea61250795265;p=linux-4.9.git

Merge branch 'fbmem'

* fbmem:
  Further fbcon sanity checking
  fbmem: fix remove_conflicting_framebuffers races
---

afa49791caae70cc3fd665a182eea61250795265